Added validations and made default expire time mean something