fixed NS
refactored hydrated attributes behavior