Bit of editor work, added componentKey to components