Some structural changes and SmallAlbum behavior. Untested