Updated to use the new abstract core implementation
Updated to use the new abstract core implementation