Further modularization of skeleton