Added new constants and updated name of Controller