[FIX] Element CRUD