Start adding core function support