Add validation and edit to clean up resources