Added editing and sample data