Added more freatures