Added @Configuration based config and usage