Refactored parameter reconstruction
Added likelihood