Added class variables and constructor