Update for Lime refactor