Modified class for additional functionality