Rewrite + Changed systems to objects