Implemented more methods to the new stereotype mode adding some todos