Added Camera and other supporting features