Additional work on controller framework