Add all changes from Conception project