Added support for :entites and :identifiers keyword args.