improced build to link modules