added support for better reference