Updated to work with new package and domain