Working on entity libs