Work towards supporting option calculations