Added checks according to full specification