Switched to using light properties instead of custom ones