Allowing dev versions and changing to use the HasDataTrait