Added Resource Editor and relationships annotations support