Moved to a class model