Move to Command / Query handler