More work on Planet implementation