Refinery 2.1 compatibility