Features/enabled modules

For #21