Recent file implementation and few fixes