Add more fields & added @property