Added virtual message support to message model
Forms optimisation