BC-15 -  ExpiresAt param closes #15