Changed component aspect types back to its own entity