Added much features