Added support for lights