Fixed bug and made JanewayModule more consistent