Updated from previous implementation.

Signed-off-by: Alejandro Barocio A. <abarocio80@gmail.com>