[Added] Finish implementation feature