Removed dependence on parsing controller keys