Removed subclasses in favour of single dynamic one