Added dependency on entity module