Moved core fn to hashtable