Improved attributes definition