Updated handling of legal forms