Added parameter types to entities