Added generic light&shape class