Added hooks and swiftbuilder