Introduced new parametr to retrieve raw scchema.
Added some TODO reminders.