Added context - needs thorough testing. Added schema loading