Updated Scene Factory