Removed a few interfaces, fixed a key bug in request, improved models