Core: Improved Error (Template)
Module: Improved Api
Clean Up & Documentation