Add Marketplace requirements

- Fix errors