Just few small changes from previous commit, related to collection object.