Just minor changes for extension purposes

Just removed a final word and added a setter because in our data access layer we need those changes. If you would kindly accept it, we would be thrilled.