manage simple collection + some improvements