Added create, update, remove functionality