Added documentation
Remove FIXME