Changed way command pattern is handled