ENH: Changed architecure