Added initial reference support\!