BugFixes and unification of "add new"