Updates for commonplace 0.2