Some API Handling (documentation, finalizing and alike)