minor changes. Allow to used String endpoint api, instead of a fixed enumeration