Improve syntax behavior