Improve fabricate support