Issues with invalid types
Cleaning up
Integration for third party