Several improvements
Added missing file