Fixed return value
Added device enumeration