DEV: add frozen support