Basket name checking added