Remove reliance on Lily-specific schema