Vector classes modifications for consistency