Add/Refactor for light support