Reverted back to original idea of entities