Advancements to entropy max implementation