Added class features and keyboard schemes