Feature toggles

Close #626