Make classes collection protected
Merge branch 'track-tables'