Latest changes including camera plugin