Added object reference support
StyleCop compliance