Add prepare and execute