PLA-460 refactoring list creation