updated properties
added wrapper and drivers