Merged with framework