Simplify and update to 2.0.0