Add support for system version