[refactor] Variable names.
[feature] Checking field type as defined by user.