Added name resolution and artifacts