Inproved interface and added edges