[FEATURE/BUGS] Dynamic List and Bug fixing from the last commit