added pattern @Command@ and added logger