added assembly scope support