New structure on Version 1.2