Latest implemented with JavaConfig
Initial working version. still need to test overrides