Extracted from project
Cleanup and get working after extraction