Context loading and service improvements.