Converting to pure JavaConfig