Additional changes for Refactoring from Vector to List