Adapted to get System properties