More object oriented code.