Home port refactored