Added abbility to use multiple states in a entity