Updated API to target 18