More extras to forms module