Add @Configuration changes