Context added, data components refactored