[TASK] Cleaned up legacy terminology
[FEATURE] If fromJson isn't provided, use input object