some changes in package definition