Merge pull request #281 from maksimov/develop

Updated the rest of abstract support classes to be generic