Refactor and release 11-April-13