Batch of commits.

- native syntax extention
- fix attributes name
- mostly cleaning