HLA-5: changed dependency management