added initial support for marketplace