Added magnet support