Added support for Modern masters