Draft changes for StronglyTyped Entity Definition