Just moved mapping logic to TexMapper. Also created a Mapper Interface so future mapping classes will just implement this.