#51 Simplified custom transactions somewhat