Added hook-support