Added support for different types of artifacts