modules fixes, trying to serialize