fix(entity): resolve update types issues /w conditions

fix(entity): resolve update types issues /w conditions #11