Imported Data Class.
Few small changes.
Small Change.