Added prepare support