Issue #216 Marketplace API