Removed all casting of ArrayLists