Issue #214 Customer management