Added rain measure and fixed optional measures