Added support for mirrors