Updated properties. Brought consumer in as inner class.