Adds more attribute support