#23 - Make build system compliant with supervisor