Adding message and command class