Planet 2.0 refactor