Added getters and setters to prepare for better value alocation.