Added constant, renamed type of struct