Removed payment interface in favor of enum; improved list