Refactoring & functionality for regular SIP milestone