Upgrade to 2.0.0 and improve stuff

Based on `move_archaius_here` branch,