Added: Decorators file
Added: Fixes