Fix tagging bug
Adding schemas