Replaced hard coded with class

Added class attribs