Final version

Includes changes in attributes names to remove unnecessary "."