added mapping to requirements and abstract mapping client