Better command handling