Better converting and manual transaction commit