Changes to avoid full rebuild everytime