Added assembly resolver, will need to integrate later