Made classes use the safe keywords