Adding core package functionality