Update for tamer-v0.4.0