Subject now has T, R parameters. Introduced MapSubject.
Moved MapSubject to main sources.