A revised Self- and Family Management Framework