Add magic check and remove skeleton functions