Refactoring + added getValueType