Changed to use String instead of Package