Removed verification + versioning