Performance improvements to workaround for list delegation. Version 1.0.3