Additional classes and commands
Fix conflict