Added option for passive systems