Added expiration date and update method
fixed merge conflict