Adapting for Pro version and prepare to fix #76