Scene manager and tools updated