Updated specification based on #101