Fixed model

Removed overhead - classes, methods, added some methods.