Merged functions to single class