Modifications required for last changes in byps