Annotations refactored
Separate context object introduced into DataTranslator interface
Many improvements in proxy handler