Added basic handling of request