Move commands to framework component