Java: Model redesign