Modified annotations based config