added type hinting to DataBuilder classes