Added less compilation to build