Made the API more page friendly