Added entropy checks