More streamlined code for version handling

Realized that the convenience methods didn't need to add the version because they call the raw methods, where version is already added