Added more to entities