Update after sky module review