Add Entry and little fix