Add more framework classes