#14 Language improvements