Removed unused import and added attribute option