Added numpy support