Added more support to implement basic NOOP command, but still need to complete implementation