Added light and pickup controllers