Added support for safety interface