New bean API-s and a sight refactor