Reverted next() call on current() method
Call parent implementation of AfterValidate
Added a todo list