Separate control functionality

Further enhancements