* Changes for new package