add hooks and core module
remove table
Merge pull request #516 from luvit/fixes/add_hooks

add hooks and core module