Add initial support for custom modules