Added entropy measures