Removed old functions
Added metatable functions