Move types from Shared to Utils and make them internal