Added exceptions and started vector update strategies