Add owner class and move compare functions to owner