First Release internal refactoring