Streamlined attribute save & fixed duplicate checker