Few tweaks with filesystem and added attribute