Update the Forms module to support sites