Refactoring merged in to align with 1.3 changes coming