Tidy up extension manifest, and add custom type