Implement active merchant interface according to reviewers comments