[improve] Collection Class creation