Added full 1-2-stable compatibility