Replace annotation based configuration with bean configuration
Add DocumentId element on new ID