Refactored update/create to remove Form dependency