Just dropped in command handling into service package