Use separate angle type lists