Added observer and refrehsing
Error handling
Error handling