updated to toolkit to use base collection interfaces