Added support for planets