added attribute support