Added controller consts versus hardcoding.