Added in the core project