Added back keywords that were removed.