Added logger
Added JavaDocs