Changed objects to user callbacks