Extended version for BerlinJS