Improved space alloc
Replaced corex hooks with func-calls