Updated datatypes in core. Added leaf-level classes based on resource priorities