XML config replaced with Java config