updated all modules to use new extend capability