Better handling of artifact types