Draft: Rewrite of defaults handling