Redesigning an Existing Class