Fixed bug in instance management when using set extensions
Fixed problem with mapper not actually mapping