Added egg support