Some changes on Note object structure