Changed some things for API integration