Implemented storage decorator
Implemented UOW