Added utilities and other Make magic