Use API instead of directly acessing the structure
Merge branch 'PHP-5.6'