Fix structure; add osage