Added id to inspection and measurement schema