Add structure to allow for edit and search