Bug fix in Transform manager and performance improvement