Added more commands
Added missing operations
Removed unnecesseray (for now) classes