Matching 0.9 spec