Improved collection markup and Fixed #632