PB-624 #comment - optimizing imports for the project