New fields for module spec
FINALLY added conditional resources (fingers crossed)