Added option to enable/disable features and removed unnecessaries
classes.