Introduced another mojo at load time and also adjusted made attached artifacts work too.