Rebuilding to better work with the Exo.Spine.List