Removed dependency to icanboogie/modules