hw models - fix for api binding comments
hw models - cli refactoring