Improvements for beta site ready