Add wrapper to build images