EST-305: add index to index value
EST-313: setters for injected services should be final