Refactoring context.xml