Final details that finishs this feature. Related to #19