Switched from abstract entities to primarily database orientated entities