Made the API more lightweight