Refactor to use entities builder.