Now both Aging and Birth should be compatible with those before refactoring.
Deprecated functions marked as such.