Develop - added contextRequirements support and general bug fixes after testing