Add BS4 support