AbstractScalar, Integer & some other changes