Fix attributes
Fix dependencies