Added more features to the power system / power network