Added getters and constructor parameter initialization