[Tokens] Made tokens optional in MasterModel class plus misc fixes