Command pattern added...