Align class with Collection class