diff --git a/src/main/java/com/pokegoapi/api/inventory/Hatchery.java b/src/main/java/com/pokegoapi/api/inventory/Hatchery.java
index 19236139..ba7f43e8 100644
--- a/src/main/java/com/pokegoapi/api/inventory/Hatchery.java
+++ b/src/main/java/com/pokegoapi/api/inventory/Hatchery.java
@@ -66,6 +66,7 @@ public List<HatchedEgg> queryHatchedEggs() throws RemoteServerException, LoginFa
 		} catch (InvalidProtocolBufferException e) {
 			throw new RemoteServerException(e);
 		}
+		instance.getInventories().updateInventories();
 		List<HatchedEgg> eggs = new ArrayList<HatchedEgg>();
 		for (int i = 0; i < response.getPokemonIdCount(); i++) {
 			eggs.add(new HatchedEgg(response.getPokemonId(i), 
diff --git a/src/main/java/com/pokegoapi/api/inventory/PokeBank.java b/src/main/java/com/pokegoapi/api/inventory/PokeBank.java
index fe40c054..9e3fa2b8 100644
--- a/src/main/java/com/pokegoapi/api/inventory/PokeBank.java
+++ b/src/main/java/com/pokegoapi/api/inventory/PokeBank.java
@@ -82,4 +82,19 @@ public boolean test(Pokemon pokemn) {
 			}
 		}).collect(Collectors.<Pokemon>toList());
 	}
+
+	/**
+	 * Get a pokemon by id.
+	 *
+	 * @param id the id
+	 * @return the pokemon
+	 */
+	public Pokemon getPokemonById(final Long id) {
+		for (Pokemon pokemon : pokemons) {
+			if (pokemon.getId() == id) {
+				return pokemon;
+			}
+		}
+		return null;
+	}
 }
diff --git a/src/main/java/com/pokegoapi/api/pokemon/HatchedEgg.java b/src/main/java/com/pokegoapi/api/pokemon/HatchedEgg.java
index 396a4033..afe8f000 100644
--- a/src/main/java/com/pokegoapi/api/pokemon/HatchedEgg.java
+++ b/src/main/java/com/pokegoapi/api/pokemon/HatchedEgg.java
@@ -1,3 +1,18 @@
+/*
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.pokegoapi.api.pokemon;
 
 import lombok.AllArgsConstructor;