BK-1196 - Implement multiple save options