Export type Focus
Add more type signatures
Move Focus definitions lower