Typing up of the API and added Catalogue