Updated Scene Model Class