Some code restructuring, stub action implemented.