Updated types still using non generic lists and ID as long