Moved Service config back to JavaConfig
Brought back more JavaConfig