Added core unit functions.