Add more attribute and function