Temporarily commented out outermost limitation setting for Album. Needs updating for recent changes.