Add days field, fix expirey check