Added collection check