Improve rack_context