Updated module

Fixed for new API signature generation