Implemented basic structure for missing classes