Feature/improve fish manager