Added new, show & edit functionality