Assignments storage, need to fix tree