Added expire support and removed class constraint