Simplified the project & updated to 2.3.0