Added check for Pocos and fixed collections