Reworked construction of beta conditions