Add build code and remove old import