Updated the rest if abstract support classes to be generic
Fixed typos and annos in RDS meta
Merge pull request #281 from maksimov/develop

Updated the rest of abstract support classes to be generic