Need to check for external hash here