Fix MctopCommand and make it more efficient