Updated how tags core functions work