Some functional added