Changed exposuing List to Collection classes