Use handles to avoid unecessary memory usage/leak

Use handles to avoid unecessary memory usage/leak #309