Made hook creation more generic
Added fixme note