OAK-377

Formatting changes
Implementation for newly added methods