Either added to types and functions