Continued enhancing custom_setup.py