Added more skeleton functions