Added more control over the refnames