Implementations for Command interface
Few changes for better command compatibility