Adding full mass matrix option