Updated setup config and manifest