wallet module updated for performance