Made expiration time configurable