Added composite pattern to entities