Add Z1 Compact Support