Added scene infrastructure