Updated to allow better build infrastructure.