Extend expire date

This pull request is not yet ready to be merged, because is missing the migration script with Comment and Node, anyway the other part are working well