Removed helper types