Updated specification with few compatibility fixes