Refactored family api a bit