Added simple entities support