Improved request handling, removed classes.