Correct method names
Add standalone application component for easier testing.