Split up motivation and universal client