Add functionality for tiny-server, but not fully working