Stability update and feature added to main App class