Added .atom support