added loader logic for commands