Added partial mock support