#30 custom modules + #497 Replace IDs with type