Moved index/type setters to constructor arguments