Add definitions and skels