Changed to class based implementation