Fixing build by including extensions for all cli

Removed references in model