Updated Form Module to use Vectors