Control enhancements

API refinements