Release core refactor