Cleaned up context handling (binding and request assoc)