Added context.xml creation