adding modules builder and update error handling