Include management functions. Fix names.