Cleaning up albums logic. Added context validator for access control