Removed size from stat to improve performance
changed class name