Ameliorations
Use the best APIs
Improved design

Signed-off-by: Levi <l.lirvat@gmail.com>