Refactored martat and cafesolo. Added also wanhajuhana.