Add feature flags handling to the client, rewrite staff mode to a trait extension style