Add functionality for extra lights

Change-Id: If9c355edd46205a7e98cb6255b1339bc0ff3c911