Port syntax to use core functions