created data structure, updated deprecated issues