Add more building functionality to container