Replaced (final) db.commit's with decorator
Proper nesting (with rollback option)