Add Yap skeleton