API Semantic enhancements + references fixes