Improve annotation-based config.