Small fixed & API implementation