Splitting operations in to separate classes