Move internal details to internal impl!
Added support for comments