PROG-405: altering the expiration API