Some features of API implemented, implemented entry handling, better request handling and cleanup