A Flexible Approach towards Public Transport Modelling in Travel Demand Models