big architecture changes, added Phone entity