Try to factor out shopware-specific calls from the general number creation code; Fix custom variables