Added structure draft
Fixed expression in hooks