Added Camera support