Expand Core API