Some changes. Added user_command to modules