Changed the mechanism for assets watching