More elegant way to add custom versions