Add Comments and explicit conversion