Improvments to TAMination initialization