Added simple entity and scurity