Adhering to new AVATOL specs