added classes, commands for local aspects