Update: Add decorators to watch list and Use Spring
Refactoring spec