Added nanny feature and test