Added command_end to the configuration
Simplified command end handling
Moved default parameters into parameters method