Cleaned up sub operation handling in Master